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

Change-Id: I00305d1a4d92bf0d67825feb757634679a6166d4