tree 9f7975fa06ba7d42e8aae29c2eb4d1a0d6e6c7e3
parent 5adc98847d56b0d0420eda55e33a2c13100519f2
parent 94f1876ff077cf9c38d517cab7981bf398464075
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676435103 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676435103 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21351238', 'googleplex-android-review.googlesource.com/21259403'] into tm-d4-release.

Change-Id: I02dcf172d16418c638a1ee1e73e2ea509ebf64c0