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: ea22c9c9

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



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