Merge "Set USER_FIXED for all non-granted permissions as long as one in the...
Merge "Set USER_FIXED for all non-granted permissions as long as one in the group is changed." into cw-f-dev am: 0b37fee3
am: 8c6fc729
Change-Id: I1957d238056ceaea65212e9d9c54efcaf26efc9c