[automerger skipped] Merge "Revert "Add btm_cb.notify_when_complete_cb when...

[automerger skipped] Merge "Revert "Add btm_cb.notify_when_complete_cb when inquiry is cancelled"" into tm-dev am: cb955703 -s ours am: fce51c38 -s ours

am skip reason: Merged-In I60bae5d51b6128489964f7ed32c4f9f2605471a0 with SHA-1 796cb886 is already in history

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



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