Merge "Merge bta_dm_service_discovery_cmpl into bta_dm_disc_result" into main am: 19d1fce1

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



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