Android 12.0.0 release 12
Merge cherrypicks of [16013343, 16015727, 16015728] into sc-d1-release

Change-Id: Id1e4bdcabae439f7c93428a67225f99f6cfae87c
302 files changed