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

[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: 2feec60b am: 0cbd0073 -s ours am: 5ae260c6 -s ours am: d1cb3e9f -s ours

am skip reason: subject contains skip directive

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



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