Merge "Clarify delay parameter documentation in VibrationEffect" am: 2b9f0c7623 am: cdbc51fa52 am: 3afe20a305

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2edda8cecdd7d7d8f16d0505629fc9c71805274

core/java/android/os/VibrationEffect.java

@@ -1208,7 +1208,8 @@ public abstract class VibrationEffect implements Parcelable {
          *
          * @param primitiveId The primitive to add
          * @param scale The scale to apply to the intensity of the primitive.
-         * @param delay The amount of time in milliseconds to wait before playing this primitive
+         * @param delay The amount of time in milliseconds to wait before playing this primitive,
+         *              starting at the time the previous element in this composition is finished.
          * @return The {@link Composition} object to enable adding multiple primitives in one chain.
          */
         @NonNull