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

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

Change-Id: I8f887febbba78ad0e002322c846375dd5883eb65