[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: 10752edb54 am: ed5c726716 -s ours am: a0e756f88e -s ours

am skip reason: Merged-In Ib3bda769c499b4069b49c566b1b227f98f707a8a with SHA-1 2feec60bc3 is already in history

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

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