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: dabe8cea

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



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