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

Change-Id: I7e0caa036926b49933f2bddeaaa57d67de6fb6e1