tree 1d6be4bcfb1fd54f018fd1ccbcc228e1e16c4a37
parent 63900551b09caea3552204d080ed320f58854c3c
parent e5d3eb51be19c28674734bccd8355578fcb0dd93
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1660787068 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1660787068 +0000

Merge cherrypicks of [17530409, 19501977] into rvc-platform-release.

Change-Id: I12e4fe100af37c17d2ca5a839118428f6b006a09