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

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

Change-Id: Ifc97dcc346e0457098c12f53fe4c641ce7e3ddc4