tree 9c7ac9e913e0de46ae6429e390c92e6dbd31cf9a
parent 7e9e70085176ea46bf773019a5054942d2fc3811
parent 3f442007d096db72b6e5092339598e1131c111d6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1686710829 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1686710829 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23543234', 'googleplex-android-review.googlesource.com/23554146'] into sparse-10316531-L99500000961260703.
SPARSE_CHANGE: I835dd545a01eb2fd7990e0fd5ad51bac0e4b1f33
SPARSE_CHANGE: I2ee30dfa5e4170272b5353f270a69b38750a0bd5

Change-Id: I3e40b22e7022dea212a7d24559dbaaa345874176