[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: 8f571da3 -s ours am: f1a7eaed -s ours am: ebb5cb51 -s ours

am skip reason: subject contains skip directive

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



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