Android 12.0.0 release 4
Merge cherrypicks of [15744516] into sparse-7694491-L25200000950986015

Change-Id: I09f6be04ba71b7ba1a41423d839a646045d68113