[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: cfc0b34432 am: 40c824230a -s ours am: 350962050c -s ours am: 5f9d966fe0 -s ours am: 1cdfc8e435 -s ours am: 8580f5dcec -s ours am: 5ded952da6 -s ours

am skip reason: subject contains skip directive

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

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