[automerger skipped] Fix drag down animation when bypassing am: 286825f6 am:...

[automerger skipped] Fix drag down animation when bypassing am: 286825f6 am: 01ba6b74 -s ours am: cad57853 -s ours

am skip reason: Merged-In Icdd62155f3762621c1046ed5271476ec0b4e2635 with SHA-1 d879f880 is already in history

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

Change-Id: Ic20b3876bcdbd47fef8727d3e994daa0e4d07ae8