Merge "Merge "Fix phone account comparison in Telecom dumpsys." into rvc-d1-dev am: b61f8672 am: 2ab580d3" into rvc-qpr-dev-plus-aosp am: c24607db

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

Change-Id: Id50a065b59afedbfa450eb4999e0d3f5579d7feb