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

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



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