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

Change-Id: Ic2dc10729bc7d6b597bf6bc020d38f30805744fa