Merge "Use proper API and switch/case for bta search/discovery operations" am: ef3e5ab5

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



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