Merge "ASHA: do service search after service discovery" am: a9afa9cd am:...

Merge "ASHA: do service search after service discovery" am: a9afa9cd am: f3efe6e8 am: 129bb5f4

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



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