tree 22e1ee9ac16ac053a93d356c8bc41c930a6883b9
parent d61d9490e1bc9535a2d98b8d0f7d991157cb5dfd
parent a95c282826b76e9ffb69fc2b391fd40c66fffe66
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676398877 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676398877 +0000

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

Change-Id: I4ffbdccf0d7e84d33d1c7a443c441b2fe47599e2