[automerger skipped] Merge "Add a config to hide the 3G option at preferred...

[automerger skipped] Merge "Add a config to hide the 3G option at preferred network mode UI" into tm-qpr-dev am: be84e276 am: 327ae0d6 -s ours

am skip reason: Merged-In I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e with SHA-1 f7685dd7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21328340



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