Merge changes from topic "polish-docking-anim" into tm-qpr-dev am: 657aa093 am: fb0dd291

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



Change-Id: I5e905ad9ecb1bb12d5e1b736740101387513e2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>