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

am skip reason: subject contains skip directive

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



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