Merge "Disable "Preferred Network Type" setting in call" am: 0e5848a43a
am: 1ad30ac21c

Change-Id: I2d08473d739a9e2c9c652e67760db38f9a7b4b10