Android 12.0.0 release 6
Merge cherrypicks of [15844355, 15840994, 15844397, 15844398] into sparse-7731482-L14200000951182699

Change-Id: Iebdb736c3d00dbdebfe7761e99d8846724373fd7