tree 8b49b5bf06f2f5203a585b28847c1568f9131e9e
parent bf780d787ebf4b42541aa74ca447abe2c8ed1ce0
parent 8270773e6a7fc9bd2e273f98a91ca86116f0227c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1719959799 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1719959799 +0000

Merge cherrypicks of ['android-review.googlesource.com/3157038'] into sparse-12025142-L97900030004927110.
SPARSE_CHANGE: I69a3f8d2fd2d7dc157d14a0f743650881eec473d

Change-Id: I93975d82e4f6120de6ad3fd5bf395d35cd14ea09