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

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

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