tree 01309ef2c0d2f3a9e427b202629aaab36a8bddb1
parent b900cad4d85e3bada7ba78c9e5d133a716996f91
parent bb458314f98712c39749f8e2fae42df864bf5347
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1680741555 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1680741555 +0000

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

Change-Id: I5f2993c46e95a744131fea454e8dab560a54fd30