Merge "Reset BTA conn_id on close" into tm-qpr-dev am: 81be66e0

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



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