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 am: 29ee860f am: 46fde1a9

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



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