Merge changes from topic "qs-animation" into sc-dev am: a4d39c2203

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

Change-Id: If17abfa10675f7268930031ea8e82c947cf18e82