Merge "Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: a16f9cc218 am: 2a237b7426" into sc-v2-dev-plus-aosp am: 70ebdbebcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302103 Change-Id: Iebea719302527eb8392c6c484d4ea3c567fc35de
This commit is contained in: