[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-qpr-dev am: 327000cf -s ours am: 91681ca8 -s ours

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

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



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