tree cf31cea128a4b42f60132cad7d33a2eb80e90b07
parent 96345eca116ac378b6013c5ce7a169748bd25cd8
parent c92375d5d959d5b294f84b471f9eccb60d376718
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1693570116 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1693570116 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23764853', 'googleplex-android-review.googlesource.com/23916075'] into tm-qpr3-release.

Change-Id: I3876a1c36c3b39d116bf8afac671d4ca2967e051