Merge "Fix issue where surface was animated while wake and unlocking." into sc-v2-dev am: b024f66885

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

Change-Id: I324e663b42e6412c2a450105eff2638850602d5a