Merge "Fixed incorrect profile shown on Settings" into udc-dev am: e69071bf

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



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