Combine MBS with Spectatio (fix udc merge issue)

for backward compatibility need to load
com.google.android.mobly.snippet.bundled now

Bug: 283858728
Test: use snippet_shell.py to test locally
      adb -s 5ac83ef8 install -d -r -g ~/SpectatioSnippet.apk
      python3 snippet_shell.py  com.google.android.mobly.snippet.bundled -s 5ac83ef8
      >>> s.btEnable()
      >>> s.btDiscoverAndGetResults()
      >>> s.dialANumber("xxxxx")
      >>> s.makeCall()

Change-Id: Ia7c877d6495378b8e39d2a7d6f71682dc32c48b4
2 files changed