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

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

Change-Id: I1f0164ef41f5e21d9010a16c2cc8ea8d02e6c270