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

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



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