Snap for 8564071 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-permission-release

Change-Id: I8543c2db0ca800169c53a3260d0b029d20f72b0f