Merge changes from topic "cancel_unfold_anim_on_rotation" into tm-qpr-dev am:...

Merge changes from topic "cancel_unfold_anim_on_rotation" into tm-qpr-dev am: aea723c8 am: d6ac901f

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



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