[automerger skipped] Merge "Get the correct MDN from ImsPhone" am: 64e72304...

[automerger skipped] Merge "Get the correct MDN from ImsPhone" am: 64e72304 am: bc8d7d56 am: 09ec617a am: 8a760d8d am: 95687db2 -s ours

am skip reason: Change-Id I040363ce94c8461f25920e750a31a4a5fd9f999e with SHA-1 68c47412 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1324093

Change-Id: Ibe9a66a4a85a3da627ce01019e22a6ff222d0760