Merge "RESTRICT AUTOMERGE Skip ALLOW_SLIPPERY_TOUCHES in PermissionPolicyTest" into android11-tests-dev