Merge "Remove TODO. We won't cache LockPatternUtils"