[automerger skipped] Merge "Fixed incorrect profile shown on Settings" into...

[automerger skipped] Merge "Fixed incorrect profile shown on Settings" into main am: a7277582 am: d6850d12 -s ours am: e00e9725 -s ours

am skip reason: Merged-In I6b7123a4bc00981f7bc0904153872f1b960983c0 with SHA-1 1ff1d1fa is already in history

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



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