Merge "[permission manager] fix permission check logic" into rvc-dev am: 01f473ab78 am: cfc2081bd6

Change-Id: Ief9cc0a2d95afa01db1883056e87d0e8eeed54d0