Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94

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



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