tree c347378b30fb8c32bc3c1840642841713fee4af1
parent d1408f61aa30b8e8ae39ea99a7c82c17a7a96ca7
parent 33ff01025b8a3e5fafceee46f0fd392468902536
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1682729867 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1682729867 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22555708', 'googleplex-android-review.googlesource.com/22768635'] into sparse-10032660-L27900000960321115.
SPARSE_CHANGE: Ia22a120a5549c8d8c4188e54c39c6967ead7d8e9
SPARSE_CHANGE: I928cc0f666cb6cbcfc05d3a471af6a842d7015a5

Change-Id: I003cb0d3f08b3fc3f2bad8fbe218342b8eb9daf3