tree 1fe6e262c46fe9c70b111c58ffce08f3e51ec014
parent 2080bfede2ed998a2a560b7b0a881ba6c68a905c
parent 58320b16ea807a1fd72f0e1a6b115f5626fdf8c4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1642193391 +0000
committer Anis Assi <anisassi@google.com> 1644275113 +0000

Merge cherrypicks of [16565827, 16572034, 16531386, 16600886, 16602652] into security-aosp-rvc-release.

Change-Id: I0e600593cbdaabde0c558cc314cf9e2285a6e9e2