[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 am: a41a11fd -s ours

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

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



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