tree 4cfeb192cd43fc3f771741bddf654a4c4b075256
parent fb4e7b9fc30cfe624abf30ed00b3232749c3ce29
parent 0bbf3f4c3e75f1995d7555cc1643db049ef1bf11
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1692670802 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1692670802 +0000

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

Change-Id: Iec60aa3d6f8cc800dfaf111da43417b2cc6bd5d8