Merge "Make subscriptionController.getPhoneNumber to private and improve...

Merge "Make subscriptionController.getPhoneNumber to private and improve variable names in PerSimStatus." into tm-dev am: 96253ede am: 17ec7f08

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



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