tree 27029f26bebd016dcd3e7b76b82a5c1afb96b908
parent 5a2cb3d164568db9394b05db690a35b709661837
parent 455ada53fcc0d3d06671f41993c6fd6c33d5db02
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1680029485 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1680029485 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21546150', 'googleplex-android-review.googlesource.com/21546151', 'googleplex-android-review.googlesource.com/21546152'] into tm-qpr2-release.

Change-Id: I27e5de5cfa3fe903725dbc0e19150473ee2fedb0