[automerger skipped] DO NOT MERGE Validate wallpaper dimension while generating crop am: 160c28c36d am: f4c3460e24
am: 145dcf2c25 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9c033a137dcc5ce774fe864b940a3afa0f65093