Merge changes from topic "re-enable-bt-instrumentation-tests" into tm-dev

* changes:
  Fix user id issue in AdapterServiceTest
  Remove hardcoded references to com.android.bluetooth.tests and removes usages of profile support resources.