Merge "Check both permission and AppOp in pollForPermission"