Merge "Merge "Fix concurrent external vibrations on ExternalVibratorService" into sc-dev am: 1dd6f20e am: e947a9db" into sc-v2-dev-plus-aosp am: e5a64001

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

Change-Id: I8e1c71251a3c255a87fd04ec111adff07de7760b