[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into rvc-dev am: 677e9e1181 am: fd98ec2c77 -s ours

am skip reason: subject contains skip directive

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

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