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

Change-Id: I1259584797186d462cd5a5bf0b258f4cf0097117