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

[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: 7505c570 -s ours am: 5be0929b -s ours am: fc055683 -s ours am: 0dda3dd4 -s ours

am skip reason: subject contains skip directive

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



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