Merge "Increase timeout on VibrationThread to wait for vibrator callbacks" into sc-dev am: 1a208a73 am: 8b9968d0 am: b2748b6e

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

Change-Id: I47f95fcfbf9b02d663ab5e4088fca0381669f671