Android 12.0.0 release 20
Merge cherrypicks of [16387342] into sparse-7976617-L34300000952210344.

Change-Id: If531745b75201d6d593cfe80774b4b9932ebfe68