tree d12cfdf9d9d0384e4efd8249cb36c5d851743823
parent 54b64200266763c5d728424ebbc0f24bec04fc19
parent c0b26cf5c20be9c4f1b6c39b2483f742fc3cbf0c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1719786177 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1719786177 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28102965', 'googleplex-android-review.googlesource.com/28102966'] into sparse-12026339-L96700030004830488.
SPARSE_CHANGE: I6c9b7a4323fa7edde47617da6c1e0d8f6e6d5101
SPARSE_CHANGE: I4a7a5b8ccb6b4822353bacc29649587cd5a3cb80

Change-Id: I615a0046c1e56b9659da8e38137988cbc77ae957