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