Merge "Respect one-shot click effect config in VibratorService" into oc-dev am: 95e55f5020
am: 063a1a3ac0

Change-Id: I1b7d3e9e381da0db1ac04a849d0bb2047b8b8596