tree 2ae62feee162969a870e440544b9e48ce221c31a
parent 6d95743658c84551eb2fa3491a4addd275b96adf
parent 2cb0c0bb734c1f163549cf5aef43e4f416f7652c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639123645 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639123645 +0000

Merge cherrypicks of [15718931, 15718932, 16248754] into security-aosp-rvc-release.

Change-Id: If9648b83f25a48d5e3ae15723df153f84e5c230d