Merge "Changing server location to com.android.server.bluetooth"