Snap for 8148170 from c39923d0bb66a6980e4c09aceb81635488066218 to mainline-permission-release

Change-Id: I27e7c255c2de3fb2c49393ab1bb845eb2a7145d5