Merge "Rename CombinedVibrationEffect to CombinedVibration" into sc-dev am: 8b2586c6ea

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104345

Change-Id: I5b4d66ee7d5f284dcd55f0044bc249d3c6d46b9a

core/java/android/view/InputDevice.java

@@ -812,7 +812,9 @@ public final class InputDevice implements Parcelable {
      * {@link Context#getSystemService} with {@link Context#VIBRATOR_SERVICE} as argument.
      *
      * @return The vibrator service associated with the device, never null.
+     * @deprecated Use {@link #getVibratorManager()} to retrieve the default device vibrator.
      */
+    @Deprecated
     public Vibrator getVibrator() {
         synchronized (mMotionRanges) {
             if (mVibrator == null) {