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

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



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