Snap for 7547121 from a2707050575cdf1c3a3519c0a6bc0535a581c6a1 to mainline-permission-release Change-Id: I8b459e902f1bc2139f555c10906476da7505a8c1