Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7b23f67a am: d318c998 am: 39978f57

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



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