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 <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 395afceff3b4338b2bc5b7a93e7a90a7fe3fd033
  1. bin/
  2. java/
  3. proto/
  4. python/
  5. Android.bp
  6. main.sh
  7. OWNERS
  8. README