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

Change-Id: Ifb248b1f183306a4a2bf69e2621596f04ba7246c