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

Change-Id: I26373d0558932fd5bf7e964ee44ac1663a997b1f