Merge "Add scale factor fields to HapticGenerator AIDL" into main