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

[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into tm-qpr-dev am: 05356e1d am: e72876bb -s ours am: 4e7e638e -s ours

am skip reason: subject contains skip directive

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



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