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

Change-Id: Iba4e69a3a52bf313c389517b3a3620f3c7a5c5a4