tree 5bc6d4d4976b1d8cc8ca127d1fd05382e11af68f
parent a84ea51e9017e828b65389d5f4dc7c1451373e75
parent ec802636732706a64b1797cc73cadc56d167326a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1642212577 +0000
committer Anis Assi <anisassi@google.com> 1644275113 +0000

Merge cherrypicks of [16190719, 16510843] into security-aosp-rvc-release.

Change-Id: I90103d50b08b1a012748ec38a03c9206225aef94