[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing...

[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into rvc-dev am: 677e9e11 am: fd98ec2c -s ours am: 73c5e86b -s ours am: d4965e52 -s ours am: 19c5c3e4 -s ours

am skip reason: subject contains skip directive

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



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