[automerger skipped] Merge "Make haptics during unfold animation configurable"...

[automerger skipped] Merge "Make haptics during unfold animation configurable" into 24D1-dev am: dab379e0 -s ours

am skip reason: Merged-In I379472097f46cab8eac82febe6eace2d45791c9c with SHA-1 7297f042 is already in history

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



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