[automerger skipped] Fix drag down animation when bypassing am: 286825f60c am: dfd23a2c1f -s ours
am skip reason: Merged-In Icdd62155f3762621c1046ed5271476ec0b4e2635 with SHA-1 d879f8802c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114537
Change-Id: I0c67c2317f52ba156deb0ab3e607698c48dfea80
This commit is contained in: