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

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



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