[automerger skipped] Fix security vulnerability issue for multi user call redirections. am: 735b84a90e -s ours am: 3eaa03b755 -s ours

am skip reason: Merged-In Ia8b9468aa2bb8e3157c227e2617ff6a52e0af119 with SHA-1 6b0e9b46ad is already in history

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

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