tree 653d340dd735a2b15a22a6eded187b78b16d5164
parent 8a4dbad6cada5d36a265342bc0062e674bb9a4a1
parent c28a62bdef689e26bcafc3e0ff8b4551d23cc266
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1697839001 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1697839001 +0000

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

Change-Id: I73f0c9259f8b183c0d5ec7aa73278533d5405d59