Merge "Add Flaky annotation to 4 flaky tests in VibratorManagerServiceTest"...

Merge "Add Flaky annotation to 4 flaky tests in VibratorManagerServiceTest" into udc-dev-plus-aosp am: f7b584dc am: 106a8f88

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



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