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

Change-Id: Ie98e346367484bbd02b3ce6a91377550498060dd