Merge "Ensure that animation does not play after brief lapses in app usage"...

Merge "Ensure that animation does not play after brief lapses in app usage" into sc-dev am: a295723c

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

Change-Id: I09a646a023a853b7b995d29dd8b83f42c20152c5