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: aa836b28 am: 1f7ba8c6

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



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