Merge "Fix NPE on BluetoothOppServiceTest" into main

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

@MediumTest

@RunWith(AndroidJUnit4.class)

public class BluetoothOppServiceTest {

        // Since the update thread is not run (we mocked it), it will not clean itself on interrupt

        // (normally, the service will wait for the update thread to clean itself after

        // being interrupted). We clean it manually here

        mService.mUpdateThread = null;

        BluetoothOppService service = mService;

        if (service != null) {

            service.mUpdateThread = null;

        }

        BluetoothMethodProxy.setInstanceForTesting(null);

        TestUtils.stopService(mServiceRule, BluetoothOppService.class);

        TestUtils.clearAdapterService(mAdapterService);

                        any());

    }

}

 No newline at end of file