tree 592f8a8d7b1a5eac6900bbf2a312d0c5ae0733f6
parent bc87987bd3d728a1e5958afaed70a8563f716a25
parent c3c4efed372781407a4e44fdcaa25f9cf886d090
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1691939282 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1691939282 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24371467'] into udc-d1-release.

Change-Id: Ieee68e63532afa8eb6fb68258ed93fe3d8c70e45