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

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

Change-Id: I817752599cc74402f1c3d05f43d15aa98bdd02b2
Signed-off-by: Automerger Merge Worker <[email protected]>