Android 12.0.0 release 26
Merge cherrypicks of [16331014] into sc-qpr1-release.

Change-Id: I38643a93f4551e1dce3eb40dfa56239e62ea02fb