[automerger skipped] Merge "Fix infinite loop caused by invalid ATT handle"...

[automerger skipped] Merge "Fix infinite loop caused by invalid ATT handle" into tm-qpr-dev am: aca46b28 -s ours am: 82c57f74 -s ours

am skip reason: Merged-In I479902b327f4f331bc9a647904b63c727ad76dc8 with SHA-1 ab5144e4 is already in history

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



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