tree 4c5b713a2f7795e8f3fc9c9e03c16c7cf359caa0
parent d47e67715fe072d05a9b362e22a0a56a0d90168a
parent 368c882ae380c5dfdd2de92bc3f9b8172b7baf9c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639689308 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639689308 +0000

Merge cherrypicks of [16207306, 16184352] into rvc-platform-release.

Change-Id: If6b77e5a51c708d5f1f4e7e8fd90379346413110