Merge "Use the real behavior to decide the animation" into sc-dev am:...

Merge "Use the real behavior to decide the animation" into sc-dev am: 26c159d6 am: 67ac799e am: 4e80784d

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

Change-Id: I15a45e059ec007c10693274011516214baa0c5da