Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7a4f6a5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474927



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