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

Change-Id: I147b111893ca6fb159827a8640c3694d34cf768f