Merge "Fixed incorrect phone number from inactive subscription" into udc-qpr-dev am: 1897d17a

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



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