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

Change-Id: I43e326ccc04534938c558f430ce4e2015347ac5e