[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-d1-dev am: 196bf026 -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/+/19417184



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