[automerger skipped] Merge "Fix haptics scaling to match VibrationEffect function" into main am: cfe1e76d5c am: 1273174105 -s ours

am skip reason: Merged-In I56116536d7cddab29448f0e436ee752c7181eb45 with SHA-1 fd0e14cbaa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3253019

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