Merge "Fix the bug that phoneId is used to get carrier config" into udc-dev am: fb389406

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



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