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

Change-Id: I5f0a61c5a7a964cc66c1e3131ee7678af7afd3f4
302 files changed