Merge "Expand all permissions when permissions in a group are individually managed. am: 1019d73896 am: 6b8280477d" into nyc-mr2-dev-plus-aosp
am: ffe2b72631

Change-Id: I6a3664dc3f3d16421b7bade0306eaf8a8c2bb9b9