Merge "Fixed incorrect phone number from inactive subscription" into...

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

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



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