tree 196f54da1483646e9a2a30db60bb1fd627756881
parent 8b1879ea680ccf1b6641725954fad6125fde93ea
parent 17aa5aaa5f9c97a3de16b4af7dc758555e4687cf
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1720649990 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1720649990 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27632412', 'googleplex-android-review.googlesource.com/28062211'] into security-aosp-tm-release.

Change-Id: I1ef23379de9fc8f2db8e15878f63b11ca98fd315