[automerger skipped] Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev am: 17fd658061 am: 9c9c1c0f8a am: 7c50686c92 -s ours am: a234d64df2 -s ours am: 76e1059b1a am: 0eef3050da
am: 55058c3d01

Change-Id: Iaf2248b2a923b011876f049e499f41d1ef51a610