Merge "Fix documentation of delay param in VibrationEffect.Composition" am: 040919bef5 am: d95f42a4ee

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

Change-Id: Ia7dfebf9187054eccb3ca9a2309a94ac674995f7