Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda am: 5f6672c4

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

Change-Id: I378ecfc73abeb71f4b9f9c6cb6a984be81f77f86