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

Change-Id: I836c30dc92331e27ba0257c97fa209472c41ea69