Merge "[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: a4138916 -s ours" into udc-dev am: a0338d9d -s ours am: 113c540c -s ours

am skip reason: subject contains skip directive

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



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