Merge "Fix vibration prioritisation for external and "next" vibrations" into...

Merge "Fix vibration prioritisation for external and "next" vibrations" into udc-dev am: a054b3e1 am: 8d9147e3

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



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