Merge "btif: Return after closing the socket" into qt-dev am: 61c7e561

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13486155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6f1e224a54b4c8b4ea5618d307e8cad56c64bca