[automerger skipped] Merge "ASHA: Enhance ASHA connection flow" into tm-dev...

[automerger skipped] Merge "ASHA: Enhance ASHA connection flow" into tm-dev am: 47bc6c59 am: f661e2c3 -s ours

am skip reason: Merged-In Ia71fee66ff914e2eb352daa3c4b78dace0412ded with SHA-1 c7c358d2 is already in history

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



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