tree f7dab6c743c31ddc84cf8e706c7b859ec0c63705
parent 2600208a1609a06105d958528dc1178dbcb3fa31
parent 9acc1bf5ec8788016b268a7bbbbf116b99050a7b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1654929512 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1654929512 +0000

Merge cherrypicks of [18766116] into rvc-platform-release.

Change-Id: I76d22b5d83a203901d0fd40bf1a4bd91e3cf3a5e