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

Change-Id: Ibb5b97f4c811392e06241f1c972ca6e101b81e01