tree 60596ac778dfbc7622b3ae8e3373799affb8a4d7
parent 4bfdbbb41780651d9f8c34cb586692317acf95f0
parent e13b429707156b7f8aa912e5e0915c8480963a21
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1644531118 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1644531118 +0000

Merge cherrypicks of [16624024, 16612525, 16804648, 16743363] into security-aosp-rvc-release.

Change-Id: I61bac3e6df8ab71bfcd26ab6452d40d46ec949e4