Merge "Add some functionality to Settings ShadowLockPatternUtils"