[automerger skipped] Merge "Fix issue where surface was animated while wake...

[automerger skipped] Merge "Fix issue where surface was animated while wake and unlocking." into sc-v2-dev am: b024f668 am: 7761aa3c -s ours

am skip reason: Merged-In Id72f3124ee6c2c5c0867ac3cea8c2b04daa208c8 with SHA-1 bfc88570 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16466631

Change-Id: Ic2d08159188244eb7fff25afdd718317c4aefc47