[automerger skipped] Merge "Reset BTA conn_id on close" into tm-qpr-dev am:...

[automerger skipped] Merge "Reset BTA conn_id on close" into tm-qpr-dev am: 81be66e0 -s ours am: 3a2687bb -s ours

am skip reason: Merged-In Icc7533ed0588128fa044694d4c43f09bac6d93ed with SHA-1 6f5e5bff is already in history

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



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