Merge "Call join() in teardown before tearing down"

package com.android.internal.telephony;

import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;

import static org.mockito.Matchers.eq;

        mCarrierResolver.removeCallbacksAndMessages(null);

        mCarrierResolver = null;

        mCarrierCarrierResolverHandler.quit();

        mCarrierCarrierResolverHandler.join();

        super.tearDown();

    }