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

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

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



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