tree cf19116ed2481f070929a89296c2fbeef772332a
parent a7eb8e3c0ee2cded715b980033b2e713da26c809
parent a9d41ef7a9a7e4056cf3729146ecc94a3a9ce038
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1636695478 +0000
committer Anis Assi <anisassi@google.com> 1636766830 +0000

Merge cherrypicks of [16177016, 15975347, 15975348, 15975349, 16194632] into security-aosp-rvc-release.

Change-Id: Ief8d4076b73763e166ef3bd7b9af90cb5f67b138