Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev