[automerger skipped] Merge "Add more options to cmd vibrator" into rvc-dev am:...

[automerger skipped] Merge "Add more options to cmd vibrator" into rvc-dev am: 70efc10d am: 25d04727 am: b14871cd am: e26c1a2b -s ours

am skip reason: Change-Id Ie77c4309e7c464b32e8dd6150a7840f1dc385e14 with SHA-1 a42d538b is in history

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

Change-Id: I409de21a0c9a1111e597c6199c848828c78933ed