[automerger skipped] Merge "Add btm_cb.notify_when_complete_cb when inquiry is...

[automerger skipped] Merge "Add btm_cb.notify_when_complete_cb when inquiry is cancelled" into tm-dev am: 6a9d7ece am: 32d1a964 -s ours am: cd1e2912 -s ours

am skip reason: Merged-In Id30367eed441173e9c333cd2d8e259bb9fe700d9 with SHA-1 9d469a3f is already in history

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



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