Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 48ea1de25a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

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