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

Change-Id: If4b1f8adf066ec9defb0e7e39106c3a551508f06