am 40de9e82: am 3188574c: Merge "[LockSettings] adjust legacy patterns to base...
am 40de9e82: am 3188574c: Merge "[LockSettings] adjust legacy patterns to base 0 for unlocking keystore" into mnc-dev
* commit '40de9e82':
[LockSettings] adjust legacy patterns to base 0 for unlocking keystore