[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am:...

[automerger skipped] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: 10752edb am: a452c1c9 -s ours am: 08cee399 -s ours am: 85f8c829 -s ours

am skip reason: subject contains skip directive

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



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