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

Change-Id: I6d22e3d4cde971226db5965fa36755b165e500f1