[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: d034e6b3 am: 1ea82feb -s ours

am skip reason: subject contains skip directive

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



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