tree 34b42a72382ed04d7dfd80c54e8a56f136c30920
parent 44aefc2a50ff23b5a675686afeae77169066b375
parent fecf470bfbdca2e9b73836ea31d1308625da67d8
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1649449777 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1649449777 +0000

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

Change-Id: If7f996b43073574763f9f762aa3bcb6c8a3f4e28