Merge "Revert "RootCanal: Refactor implementation of Inquiry and...

Merge "Revert "RootCanal: Refactor implementation of Inquiry and InquiryCancel"" into main am: f0369fac am: 89384290

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



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