[automerger skipped] [Pandora] Fixes for OnPairing implementation am:...

[automerger skipped] [Pandora] Fixes for OnPairing implementation am: f5b89305 am: 519be968 -s ours

am skip reason: Merged-In I72cfb644b0fc8d38931455a2f893c2dae3136457 with SHA-1 f5b89305 is already in history

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



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