Device search/service discovery header cleanup

Separate the internal header, and clean up shared message types.

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