tree 199de88ef63f8cec5260572a3fe7e3767d7684c6
parent 8f308f98966d9bf92f97ab48ef30a34418be4f0d
parent 7c0560c78efb16c3a8771e2dc6b0c90b66685f22
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1682695841 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1682695841 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22513714', 'googleplex-android-review.googlesource.com/22517511'] into sparse-9945958-L50800000960300293.
SPARSE_CHANGE: I843f28b80d7d372d2c995b77fd4e3acbd1edc35c
SPARSE_CHANGE: I57545bc8a227df751fdeff17be20aca08e96305b

Change-Id: Ibd6f2f22f4fe9ac837db40bb766592bc376a3b04