tree b92e8cc9c592374ea9d358479a4e77ebd3d1cb81
parent 7699e13344aad0949102764c05295e39a7e23517
parent dc06656820b1f3b188bf3115a1098280ecc293b8
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639523441 +0000
committer Anis Assi <anisassi@google.com> 1641330483 +0000

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

Change-Id: I8fa49223506e5c4a1559f2ea1204187d7be8ba7b