[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166 am: 804d42f1ef am: 172a0954c5 -s ours am: b8e311740b -s ours am: 95c4e942dc am: 170465e0a2 -s ours am: 27c4aef372 am: 9948425ec5 am: 56e2b96ef7 am: 7467df3815 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786 Change-Id: I0005fbe02e38ece3a6a17673424528f1718c9bd8
This commit is contained in: