Merge "Decouple HapticScale from ExternalVibratorService scale."