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

Change-Id: Ie6645d6cb36fbbe0c2274553ce0436d84670f0ad