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

Change-Id: I87672e93b7ebc6c72cd5cb17ff7f8d046f774bb6