[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into sc-dev am: 1dbd013d9f -s ours am: 8f571da34a -s ours am: f1a7eaed3b -s ours am: ebb5cb5111 -s ours am: 8aadb3c888 -s ours

am skip reason: subject contains skip directive

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

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