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

Change-Id: I3aa06104d3dc7e0c419bcf1a3eeec3bcc7b77176