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

Change-Id: I5b5f1670ee60d49a0a35172f01192ad99ccbe00f