[automerger skipped] Merge "Add Flaky annotation to 4 flaky tests in...

[automerger skipped] Merge "Add Flaky annotation to 4 flaky tests in VibratorManagerServiceTest" into udc-dev-plus-aosp am: f7b584dc am: 106a8f88 am: 47448a63 -s ours

am skip reason: Merged-In If7c7a2c94db3eac4f4bc79a6c05c35683031a50c with SHA-1 3e5d158c is already in history

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



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