[go: nahoru, domu]

Android security 12.0.0 release 61
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22977056'] into security-aosp-sc-release.

Change-Id: Ia0a292961cca7a7e7b13e8afe20608681baac2d9