Android mainline 12.0.0 release 15
Snap for 7547121 from 0e9557972eee28f1b3d40da1a1986d5a6ab61871 to mainline-permission-release

Change-Id: Ie071d2c07b08af17dc268040e3025b8852dff66d