[automerger skipped] Merge "Fix missing app name in call redirection dialog."...

[automerger skipped] Merge "Fix missing app name in call redirection dialog." am: b99702b1 am: 191ac660 -s ours am: b1c7251e -s ours am: c8cb3529 -s ours

am skip reason: Change-Id I1ff848c0652413ea82f33de65c4ba14a9d9bfff0 with SHA-1 f9f6ac41 is in history

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

Change-Id: Id19b11a1861b9f741c5247ab92124b81e519d3e3