tree 00c4d71fdfa7e27e0b0e36e794559f1a40e9255b
parent c8beb73df132bbfc4f9aba238350680bb569c415
parent cbe8968d19414613a31196b999ec27c3ce561000
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1693418088 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1693418088 +0000

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

Change-Id: I18189229c860401da0c3050b2ac73ad6facc1dac