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

Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: d80badd6 am: 496f889c

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

Change-Id: I6edf40f9f198d9f8d5394e255b7c8fb17b23d930