Merge "Use Thread.dispatchUncaughtException() rather than duplicating logic."
am: c8ba678762

Change-Id: Ifdd9c4b4e8ee45eb36bb763703f3e73de25262c1