Merge "Improving diagnostics when Launcher dies while in ContentProvider call" into sc-dev

import android.graphics.Rect;

import android.net.Uri;

import android.os.Bundle;

import android.os.DeadObjectException;

import android.os.Parcelable;

import android.os.RemoteException;

import android.os.SystemClock;

        try (ContentProviderClient client = getContext().getContentResolver()

                .acquireContentProviderClient(mTestProviderUri)) {

            return client.call(request, null, null);

        } catch (DeadObjectException e) {

            fail("Launcher crashed");

            return null;

        } catch (RemoteException e) {

            throw new RuntimeException(e);

        }