Merge "Use the real behavior to decide the animation" into sc-dev am: 26c159d6 am: efe2a20e

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

Change-Id: I04809e7f92af5f361e17a924556ed9316fa07dba