Merge "Updated setPermissionGrantState to scroll through permissions, since the permission to grant might not be shown at the top." into pie-cts-dev am: e9874d4014 am: fe5c0050d5

Change-Id: Id887b7cc70b30ab407efd0eab90deb55734a39c5