tree 1797abe3143644bda0e114e7916f407a64f63a90
parent a6e66aa900a099290c3a24836af4de19922365e6
parent 4e209c5231729c8fedef290e7834754a53d71af1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1681434217 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1681434217 +0000

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

Change-Id: Iae0b3c09526d92bcb7df495610cd8ad8c4639db3