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: I7eb29c3fe603689c08d9f5095ba8bb37827d9d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>