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

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

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



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