Merge "Modified CTS KeyguardDisabledFeaturesTest"