Merge "Fix inquiry time too long" am: af61e537 am: c9dc8d2f am: b4f88576 am: 9fc7af2e am: 794155e0

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



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