[automerger skipped] Merge "Winscope: apply surface transforms in preview" am: 456ccff485 am: 05693202ac -s ours am: caf8c73b64 -s ours
am: c389c55709 -s ours
am skip reason: change_id Ia9528401a0d8542266a7898be6d032a6cf166946 with SHA1 2394e4ecac is in history

Change-Id: I68b77d38fb4a3b6e62fc2a8045e31ca075de5df8