Merge "Correctly handle passkey of zero" am: d225c180 am: ca68166d am:...

Merge "Correctly handle passkey of zero" am: d225c180 am: ca68166d am: 9ade75cd am: 0845d4ee am: 1a11f74e

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



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