tree 7955ed97742582bcadb44a0faf76cef9f389229c
parent 3c58019acd38e6af7ddffefb732f4535834ee7d1
parent b5514cf19484fee1cd8141f9da1eb810751497bf
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1680029437 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1680029437 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21411280', 'googleplex-android-review.googlesource.com/21992144', 'googleplex-android-review.googlesource.com/22076526'] into tm-qpr2-release.

Change-Id: I0615b1228d0880d668109778bce5b95a855f36c7