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

Change-Id: I9ebd4480af2db8006ee915aeba368e909e52a13a