Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" am: 18e1a7c047 am: df73f7e090 am: c8f766c6d3

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

Change-Id: I8100cb2f94593bb36655f6faf3ccd1ab11e56170