Android mainline 12.0.0 release 15
Snap for 7547121 from 8687a85bc0e6ef46bac3bce290cca2cddc7d6720 to mainline-permission-release

Change-Id: Ib10ab5cb3a81e417d249b8aadc7bb4c8d3e90d97