Merge "Give ongoing ringtone vibrations priority over new incoming...

Merge "Give ongoing ringtone vibrations priority over new incoming vibrations." into tm-dev am: 42f94193 am: 87733960

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



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