tree 17669548f4bfff3fc9bde6dad962f8f594e8afa1
parent 0ac6ff00d7f78683483a66e44d8a2107863a25b9
parent 73c0e343bf27cf2579d54ed726882640c8b92fd3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1693575492 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1693575492 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23722149', 'googleplex-android-review.googlesource.com/23722150'] into tm-qpr3-c-release.

Change-Id: I94247b8073a68f134e8b0416482f82b411081868