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

Change-Id: I1ee0d00f864a45705cb7df21f6d6d3e1a8d6aa60