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

Change-Id: I3af7f40306101295c1e335e99eb37cee67280c4a