Merge "Merge "Stop animation when screen times out and the user turns on the...

Merge "Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: d80badd6 am: a636917f" into sc-v2-dev-plus-aosp am: 0a12449f

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

Change-Id: I395b3754d6298e035a3b199c504c6bdce62e4a0a