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

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

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