Ensure that Numeric Comparison pairing is not treated as Just Works am:...

Ensure that Numeric Comparison pairing is not treated as Just Works am: eaef6ea9 am: fff1a253 am: b73ea0ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18185797



Change-Id: I05df3b06fc293fd1392dbb53faf38eb58d6a1371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>