Merge \\\"Reduce race when connecting to an existing content provider.\\\"...
Merge \\\"Reduce race when connecting to an existing content provider.\\\" into nyc-dev am: 5f9afa96 am: 3716762e
am: ee18f5fe
Change-Id: If032e53cc81ac3863818d98c5284f5b2501c8226