Merge "Fix infinite loop caused by invalid ATT handle" am: 8a6b094b am: 821f80cc am: 0d72c20b

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



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