tree e20a7029e538b53dfcc4021913cfe624157dc919
parent b420deb9b770dffccffde9852a8703d447ebf051
parent 78b42aeb37c04c0da0fe07f46c2558f15a7efc6b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676398871 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676398871 +0000

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

Change-Id: I64afa6b17b073b955daef1dd167d00562a0bfb79