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

Change-Id: I757c68cc64148404b8230562570252dabd642617