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

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

Change-Id: I0d3b8ab1074e3e3dcbce151f0b92f9751b079edd