[automerger skipped] Merge "Replace and remove unmetered carrier configs" am:...

[automerger skipped] Merge "Replace and remove unmetered carrier configs" am: 58f0b4ca am: 52195dcc am: f2ad5936 -s ours am: 6e623f09 -s ours

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

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



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