Android mainline 12.0.0 release 93
Snap for 8146118 from e6cda5303ec6794ce6b48bdc809fd473928345d0 to mainline-permission-release

Change-Id: I0c143e9a5ab5bcc679af18b5ba02d92440bbd255