Prevents an NPE when content provider is slow to start

Also, extends the client-side timeout to match that
in ActivityManagerService.

Also, fixes an ANR that could occur if getType is called for
an unknown content provider

---------------

Revert "Revert "Prevents an NPE when content provider is slow to start""

This reverts commit 3a54efff.

Reason for revert: Roll forward of the original CL,
  with a fix for the regression it caused

Original commit 140fc2e9
Test: atest FrameworksCoreTests:android.content.ContentResolverTest
Fixes: 148987678

Change-Id: Ic60acceaabbf6b32c71d0b8bdf831a7d1f13d392