Android security 12.0.0 release 34
Merge cherrypicks of [16373492] into security-aosp-sc-release.

Change-Id: I9d0255607a22853aa9a8dd25424b9f848a24c9d9