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

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

Change-Id: Ibea737bff7d7e05f51b92363fed921742e7b8748