Merge "Add enable/disable permission to permissioncontroller" into rvc-dev am: 4af07bb5f7 am: 91d9703e1d

Change-Id: I18e4a50192a135d9ead497fc1d19da68b9e75fe2