[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am:...

[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: 10752edb am: ed5c7267 -s ours am: a0e756f8 -s ours am: 130d0f69 -s ours am: 8cb0fb07 -s ours am: 668ad4cf -s ours

am skip reason: subject contains skip directive

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



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