Merge "Do not crash ui app upon bad provider pending intent." into udc-dev am: 8bf2277f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23078397



Change-Id: Iedb5113ec649f6fb2bb96b8909173cc004cb79bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>