tree 41f1893200977ebfcf00b714f541b3e8bd85405d
parent e7774409b8ec8ae7179ab2372e759808650f415e
parent 7e86b8e3189f9719538a97952dff8ea1c6b67f8d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1637626874 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1637626874 +0000

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

Change-Id: I993978f286bcba93f425a92a0bc828bbf20b87b5