[automerger skipped] Merge "Add carrier config to hide roaming indicator" into...

[automerger skipped] Merge "Add carrier config to hide roaming indicator" into udc-qpr-dev am: 4db8abcc am: 1a8a3ec7 -s ours

am skip reason: Merged-In Ifb13cff474d3c4cd0febec620338674e02b58217 with SHA-1 412e18a8 is already in history

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



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