Android security 12.0.0 release 34
Merge cherrypicks of [16367128, 16432387] into security-aosp-sc-release.

Change-Id: Id5c3ea68175e0405b44e70fcc3c2270e80128444