tree d0f7b9bbd4cda8f47cb90686c136e780dc1d70c8
parent cb82bf209576363b1724332d0cbf7b726e787461
parent 0cf05c92e383884a331c801eabf33dcbb5c637dc
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1697510756 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1697510756 +0000

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

Change-Id: Iaeeb3a4bb9b1148fc54bbe41ed79f4b304ccb57a