Merge "Fixed incorrect profile shown on Settings" into main am: a7277582

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



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