Merge "Fix VibratorManagerService test handling scaling effects" into tm-dev