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

Change-Id: I3b636176d338c7ff1a951d1cc534755ece4aab33