Merge "Set USER_FIXED for all non-granted permissions as long as one in the group is changed." into cw-f-dev
am: 0b37fee3ac

Change-Id: I4dd0d5600d990cdfd2af4e39da0245a4b33bd70b