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