Merge "Don't lock VibrationStepConductor state only executed by VibrationThread." into tm-dev am: efc2678c am: cf2f6c61

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

Change-Id: I11ea31d6bc380516f6de260e60dc81d8b3321f34