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: a16f9cc2 am: 2a237b74" into sc-v2-dev-plus-aosp am: 70ebdbeb

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

Change-Id: Iebea719302527eb8392c6c484d4ea3c567fc35de