Merge "Fix NPE on VibratorManagerService" into tm-dev