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

Change-Id: Ie86c20355309fa5abb3cd3f288f746a40876a436