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

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



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