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

Change-Id: Ie269423015bf52c1d50b19b2baf0f2993b5801cd