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

[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into tm-dev am: ec7ee9d9 am: 03ef4ab5 -s ours am: d964f697 -s ours am: dfc34e1e -s ours am: f1b3cf9d -s ours am: 4a3bacbf -s ours

am skip reason: subject contains skip directive

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



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