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

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

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



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