Android security 12.0.0 release 53
Merge cherrypicks of [17008939] into security-aosp-sc-release.

Change-Id: Ie0367fceab3da451a11e4aba414a608e83c2e20e