Merge "Enabled multibiometric lockout for aidl hals"