Merge "Create carrier config to hide 5G slice indicator" into udc-dev am: cb57479a48 am: cc69bf2972

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

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