[automerger skipped] Merge "Merge "Restructure the top level of...

[automerger skipped] Merge "Merge "Restructure the top level of VibrationThread to more clearly guarantee execution of link/unlink pairs, and vibration completion callbacks." into sc-v2-dev am: 5f08589e" into sc-v2-dev-plus-aosp am: caed0999 -s ours

am skip reason: Merged-In I6a5214bf4d8da02b4894ec44a3b3379384d625c6 with SHA-1 ee627525 is already in history

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

Change-Id: I9910cdb60f3e1f5a4e6f5c9f14d800af814f9627