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

[automerger skipped] Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into sc-v2-dev am: 4bfe9a7e -s ours

am skip reason: subject contains skip directive

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



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