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

[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: cfc0b344 am: 40c82423 -s ours am: 35096205 -s ours am: 5f9d966f -s ours am: 1cdfc8e4 -s ours am: 8580f5dc -s ours am: 0aca69bc -s ours

am skip reason: subject contains skip directive

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



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