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

Change-Id: I160a313743a20096f252a8d77960db70e6dc332b