Catch ProviderUnavailableException where we can

Bug: 5159311
Change-Id: I12e7ac3443154a8fd1e75bfe04db9b5ea4bee108
2 files changed