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

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

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



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