tree 7b77c6d7d9717f535499a9a677877da803702d2c
parent 3a0ce01422ffa106e7c181a37d435548c5d4ba98
parent 11815817de2f2d70fe842b108356a1bc75d44ffb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1691687616 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1691687616 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23982016', 'googleplex-android-review.googlesource.com/24301337'] into security-aosp-tm-release.

Change-Id: I22b513b4c36c1283145003cf11fc3082e8628340