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

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

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



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