Android 12.0.0 release 16
Merge cherrypicks of [16149819] into sc-qpr1-release.

Change-Id: I8a41fdf829d71314bf43873c23744929c5083c58