Merge "[Settings] Customizable resource for hiding 3G preferred network type"...

Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbfff

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



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