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

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



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