[automerger skipped] Merge "Disable "Preferred Network Type" setting in call" into pi-dev
am: 8bc7b41e63  -s ours

Change-Id: Id8e6dfd37c97ca19f8324d406cd240587f8bfcc3