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

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

Change-Id: I1678202481ab5652a68a58ce4489aa55b1c674e7