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

Change-Id: I6ff9e978e12b9bc7b3f2519f8292a7845a2b4786