Merge "Fix the incorrect display of the phone account info for an ecall" am: 5a3d182a62 am: 59f475c481 am: b6f8f0133b am: 8a7d9293b3 am: a122b0791e

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

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