tree cafcf07bc573f9c71318e28822c72f0494fbba8a
parent d42484eb53f9528d1751999d80eff9766c7800ca
parent c8159ac52101bbc60add634f0640cb507994ad50
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1649449785 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1649449785 +0000

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

Change-Id: Id1858f8596b2ce2d375d38ad4f2d4910b2996d13