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: 641780da am: 9f7b85c7

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



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