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

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

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