tree 576df31ae5d0bce927a6a52a9f9e26c02e2dc426
parent c14d4968c0da15fa2530f18d36608c9c04a81e6a
parent 4ab8736a4a59452661bcf5b8b89284a1a66ff056
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1642193395 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1642193395 +0000

Merge cherrypicks of [16549692, 16549693] into security-aosp-rvc-release.

Change-Id: I68c28f8614f38d85e6add0ffe9cff66eeb201198