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

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

Change-Id: Icfb3a897844380990971bab39e19ef1d137e2b53