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

Change-Id: I9c58861a19260f97484e69ff30c4e11154d72c58