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

Change-Id: I23e80c9fcc369779e64cb45ba70de4064d84bc0a