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
am: 6d11d600
Change-Id: I9d9e6810b7736276d8c19434169572db499187af