[automerger skipped] Merge "Replace and remove unmetered carrier configs" am: 58f0b4cada am: 52195dcc5e am: f2ad59368b -s ours

am skip reason: Merged-In I0f8c38ef322721fe52935e5e8fbe681cd4b6495d with SHA-1 396dc80fde is already in history

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

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