[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 skip reason: Merged-In Ib3bda769c499b4069b49c566b1b227f98f707a8a with SHA-1 2feec60b is already in history

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



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