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

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



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