Snap for 10453563 from f283969c020e5601cb427c9fa08124fcccc44280 to mainline-permission-release

Change-Id: I4c14f921af3cb58f8d936b0d981119925442620c