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

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

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



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