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

Change-Id: Ibc946f3624ef228d4df58039734f01806d40bf00