tree 8680d102b19244609c76bce87ff40fedf8cd89cd
parent 714ca01062465f19c011f89900cf2fb9899f6fe3
parent d5a57c3b7a521df8079a0030b4e37919e61a8dcd
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1644531121 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1644531121 +0000

Merge cherrypicks of [16691815] into security-aosp-rvc-release.

Change-Id: I1ae606cc5e0cfdc717843c5ba1b015f0aa17a5ee