tree 8f02ad25944f25583c52f97c3f72f2dc578668ab
parent 1f4cacea81cc3d069c4aa710f4404c040756446a
parent e96d20e5244346179f49a88fea8ab5e0929444e5
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676398882 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676398882 +0000

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

Change-Id: Ibd249f3f4d97ee143a885b89e040a4ae8cfbde1d