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

Change-Id: I0cbcba8c2b1b11d1feaa1fa096b672364da32530