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

Change-Id: Iaa63513652e147d752deadb95ffc9c52c9df4b25