Merge changes Idf562f9f,I81e25db9,I242d3bdf into main

* changes:
  Merge together the two LockPatternUtilsTest
  LockPatternUtilsTest: don't call the real TrustManagerService
  LockPatternUtilsTest: use dependency injection for ILockSettings