tree ecc820f677da2032899338cdadf50d530d90fd59
parent 21d5660cbe8538d58d951c27709b51eb39ffcd95
parent dd1c2d9cb2fbe9603da24d4c92f126e66f980148
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1688095199 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1688095199 +0000

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

Change-Id: Ic090ce9884de1a69ddb7a334acadfeb35ae9e2e8