Merge "Decouple HapticScale and ExternalVibratorService scale."