Android security 12.0.0 release 63
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27696238', 'googleplex-android-review.googlesource.com/28006045'] into security-aosp-sc-release.

Change-Id: Ifd2f64d2ea534c2940ac6fbf30e45b079bc863f1