tree 5cf6dd075a7a5666d1e86f0f7c7616416077d6ed
parent df8e370b95489be6d8d5ff4471b9538f76784981
parent 6a155ff191db9307e91897fc6096e5214a9be0f7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639123644 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639123644 +0000

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

Change-Id: I70b8e72c93d3bc41dae4fefb7b874e6fe029ec31