[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: ae8bee8b -s ours am: f614d1c1 -s ours am: 8d08a791 -s ours am: f4199a9f -s ours

am skip reason: subject contains skip directive

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



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