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: I0f74a2d057732a60ac06c0dada4b324c71e87114