Merge "Increase timeout on VibrationThread to wait for vibrator callbacks" into sc-dev am: 1a208a730d

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

Change-Id: I1f2cb82b53ca313eb406f071e08585540ad1494d