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

Change-Id: Ia9b87375c24b1a122d1c271345ef4011035c46e8