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

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



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