Merge "Use the incoming call's user to get the ringtone." into udc-dev am:...

Merge "Use the incoming call's user to get the ringtone." into udc-dev am: 8947db1b am: a001a062

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



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