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: 8f55265e

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



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