Merge "[Unfold transition] Do not play haptics when hitting a timeout on...

Merge "[Unfold transition] Do not play haptics when hitting a timeout on folding" into tm-qpr-dev am: 76c74ee9

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



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