tree b04fde473c79ffb8b4d5779330228b7d7067f71a
parent 071d6967ff27d80d9aef354080ff35e004286cc3
parent 29a655b55babcacd71a830d2d64d153e37b0be9e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1685207673 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1685207673 +0000

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

Change-Id: Ic6d95e420200403c32bc7def1043b8198f171fbe