[automerger skipped] Merge "ASHA: do service search after service discovery"...

[automerger skipped] Merge "ASHA: do service search after service discovery" into tm-dev am: bc62dfef am: 7f4d295d -s ours am: 4787fcca -s ours

am skip reason: Merged-In I78e8b9c1cc78fb129d7872c98e902cc71b5a5f16 with SHA-1 f54c0fd8 is already in history

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



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