tree 34b42a72382ed04d7dfd80c54e8a56f136c30920
parent d15cacd764e013d0f6bfdee60719180d2501d139
parent a5ff6d84b6636f37fd3a2385e79b44453aade858
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1650423238 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1650423238 +0000

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

Change-Id: I0463d2eb6c51a70cf725f5aa6073e1a94fc81ed0