tree ccd2e735301ecc361cb3c2608e7a6991ab3373dd
parent cbd27dc9e6fb55df8f4a3b61efd5dca2a7503b3e
parent cbcb3ba0e5ed4c5cb8db77577b7ca37f74e68c38
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1674874638 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1674874638 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21091394', 'googleplex-android-review.googlesource.com/21116839'] into tm-qpr2-release.

Change-Id: I3a1a2ca5006b81b4c3bef31af915be727da22db6