tree deb87cb459603c9a5427443bbf6c7a30225c4545
parent 1ed404b31fa668bdb6569fc7ba4e8009a0938ee6
parent 153e539e62f510a2a246df8390efbb41e5af20f3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1636695475 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1636695475 +0000

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

Change-Id: I9f2b0d94f10e69f40906354f9bf2bfa2d18925c3