[automerger skipped] Merge "Fix flaky VibrationSettingsTest" into main am: 48ea4bf200 am: 675467c896 -s ours

am skip reason: Merged-In I7618b7894fa661d1e657c306557717979cbdedbf with SHA-1 04d2998614 is already in history

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

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