Android mainline 12.0.0 release 93
Snap for 8148170 from a01b20d1dbf04cb9f55cabafa32d530f1532f0bf to mainline-permission-release

Change-Id: I9e5f012d7b00c2f12d9d1b044e9de004750ce846