Merge "Fixed building the incorrect phone account using iccid" into udc-dev...

Merge "Fixed building the incorrect phone account using iccid" into udc-dev am: 7fcd33f9 am: ec10d879

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



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