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

Change-Id: I7f76f50a5482fdfc6d53967fa91ccff7e34b7cfd