Merge "Replace and remove unmetered carrier configs" am: 58f0b4ca am: 52195dcc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2521335



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