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

Change-Id: I73c5c4f6d0bc9a22ca6edf123bfbd531caf1d510