Backport regression fixes for 288144143 am: 3e075acd am: 74a89668

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



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