Android mainline 12.0.0 release 93
Snap for 7547121 from a4f050d004b58e5c69a84253e3f007fdbf673e3f to mainline-permission-release

Change-Id: Ifeea9d7abeaed924feac5779e81474e40ddce146