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

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

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