tree 64992d3c5e3875afbed21e19a746b7cb36e7ff01
parent b184581f50df9a951707cfd35d3a1d131319720a
parent a0e64358943caec10b079365471ae8546b4964ac
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1649449779 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1649449779 +0000

Merge cherrypicks of [17008934] into security-aosp-rvc-release.

Change-Id: Ifd02386608de99796fc928958d56a981df55aed4