tree b17081a000da0baa58d45496d2ee68894e8bf435
parent c1227742bdbd2d961bf1c6cf1856f9ffee6f8c83
parent 7664bc06e522d5841ee2737633e390eafabf77f0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1645160945 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1645160945 +0000

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

Change-Id: I45d4804b49ddc914707fef2e7dd802bf45516f75