Android mainline 12.0.0 release 16
Merge cherrypicks of [16017092] into sparse-7797873-L45000000951481571

Change-Id: I2fe1f5b41b366fd77fb99fc2924243bc6a894c7a