tree c7f3fd3b63e5100aa8337fde044254a27eadd46b
parent b588fcc439ab2fe96a6f9eb40f25f8da14dc7ac9
parent a09f62d036c55fb7963d4f545bbcd00efb567a5a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1687826595 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1687826595 +0000

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

Change-Id: Id5ab5e041c245a18aba1c763baac1ff4609f26df