Android security 12.0.0 release 51
Merge cherrypicks of [18168005] into security-aosp-sc-release.

Change-Id: I728b9bdab164eb7ae2de2b11fd16c6ec51ebf9da