Merge "Ignore lock type in ChooseLockGeneric in non-FBE"