tree 3d3de589b1570342ba843e4ac8dae26b6cc0555f
parent 7a9fd859572eff62040058258bc3e89bc90fabe8
parent 5038853cd7e841dfacd6c428a5424c3ec702e583
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1691199304 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1691199304 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960', 'googleplex-android-review.googlesource.com/24154592'] into sparse-10615697-L60900000962405601.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b
SPARSE_CHANGE: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf

Change-Id: I8eadeecea932cad65ff512b1dd944f1e2f0dcde4