[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: 07265352 -s ours

am skip reason: Merged-In I1a9505fabd581201117ec54f711c4120a092afb7 with SHA-1 7b99d551 is already in history

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



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