[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into sc-v2-dev am: 4bfe9a7ea5 -s ours am: 56d7661886 -s ours am: c33bb59ff0 -s ours

am skip reason: subject contains skip directive

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

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