Merge "Support using carrier id to setup APN" am: 3ff1168f98 am: c4f3cb2800 am: fe13105982

Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/2161937

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