Snap for 8564071 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-permission-release

Change-Id: Ifc56ea2a0059bfa760ebc79c01682bd2b648ca1b