Merge bta_dm_service_discovery_cmpl into bta_dm_disc_result

Bug: 330675788
Bug: 335732980
Flag: com.android.bluetooth.flags.separate_service_and_device_discovery
Test: mma -j32
Change-Id: I6cc310425140701b399e547e72fc8c79a5587565