[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing...

[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into sc-dev am: 1dbd013d -s ours

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

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



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