tree bc831eff4370a0f7a4f497189e81cb622740be76
parent cbb35e01dc1e3879f81fc045187441c921893e48
parent 5b21d2e84c3ba00b22bd839f2d096ef06b21e703
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1691939294 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1691939294 +0000

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

Change-Id: I0e22da03e1d88a79b9e5e1359fe3837ce72fade9