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/content/Context.java

@@ -4128,9 +4128,11 @@ public abstract class Context {
      * Use with {@link #getSystemService(String)} to retrieve a {@link android.os.Vibrator} for
      * interacting with the vibration hardware.
      *
+     * @deprecated Use {@link android.os.VibratorManager} to retrieve the default system vibrator.
      * @see #getSystemService(String)
      * @see android.os.Vibrator
      */
+    @Deprecated
     public static final String VIBRATOR_SERVICE = "vibrator";
 
     /**