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

Change-Id: Ifaf7b1de79c831b479249841d0e573c635ec9e51