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 am: aa70b67c

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



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