tree 361f4df66e7fc728cbebe0fd545568d6e709a452
parent 0a88b1323001939feaf41bb6b4b3beb7a94ea01c
parent 87f791f2351e366f842a0fd6fcb744069160d9a1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1699641096 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1699641096 +0000

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

Change-Id: I686ce700b5141944db1c17c0a7bcbb8d9b05027f