tree ba385f5af592ac1aada31357416db812a58fa7fd
parent 87e5e79d2809cde161ebe2d6e9b4fc1d7e7f3ea4
parent a4be3f8589ca88c43edcb996956324fee8a58408
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1677540510 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1677540510 +0000

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

Change-Id: I905c1ab74b49d2d92292676df80209e3f4f3e541