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

Change-Id: I51550249fb09ed12ed9fa3876a0fbc5c298f59b8