[automerger skipped] Merge "Merge "Add more options to cmd vibrator" into...

[automerger skipped] Merge "Merge "Add more options to cmd vibrator" into rvc-dev am: 70efc10d am: 25d04727 am: fa8a8880" into rvc-qpr-dev-plus-aosp am: b10da78a -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: Ie0173f56e1a52a05bc04d3057e2a5909a85d7186