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 am: e348c450

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



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