Merge "Fix MapClientContentTest test"

     */

    @Test

    public void testCleanUpWithNoSubscriptions() {

        when(mMockSubscription.getSubscriptionType())

        when(mMockSubscriptionManager.getActiveSubscriptionInfoList())

                .thenReturn(null);

        MapClientContent.clearAllContent(mMockContext);