Merge "Add EXTRA_PROVISIONING_SKIP_USER_CONSENT"