Merge "Support EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY"