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

Change-Id: I425eae5bcc03b0410eda3cbab91c890d5592824d