Merge "Catch exception during query" into main am: 959dc5d6

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



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