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: d060125d am: c277f52d

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



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