Merge "Fix vibration race condition in Ringer." into udc-dev am: b62c3312

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22762779



Change-Id: Ie333ac66527221a3a6a571259e80aa9c1677a3c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>