Merge "[LockSettings] adjust legacy patterns to base 0 for unlocking keystore" into mnc-dev