Merge "Slightly increase unfold animation timeout" into tm-qpr-dev am: acfd93fe40

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

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