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

Change-Id: Ic3bc03cd202395b90ee70df425de1a25bf74b642