tree 30e8d85c4a82dae2c8f8cdf2fe3566c01cb07113
parent 97a4ba292afd05ba8e61613948ed5f1a0fb6c38e
parent d07ee085ee66730497188a873c35bfc670a0d473
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1692415790 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1692415790 +0000

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

Change-Id: Id4331dd23183d4c3f1a3b448060fc6a14098d3d1