Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c am: 59996190cc

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

Change-Id: I09f8fc61950baac0f3d987efe84c7c6aaa6c5c13