tree 7f0387af5681fb69ea2ba014bc07e3ec08179070
parent 5c36b7e0795007a8e44535bab3208481400654de
parent 2e4906d09e4316fa6f54d445cfa9bb1d1d98ac6c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1689698972 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1689698972 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24028888', 'googleplex-android-review.googlesource.com/24028889'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: If7e9e5f99728c2f3a18b08346b4cf3449132f920
SPARSE_CHANGE: If0736e504928641c85934eae4d298f14e711116c

Change-Id: Ia90e3f84f6772d746c8707476e9ca2de19f17aec