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

Change-Id: Ia071c9a8882e5fb5492414a0f3188bd37bf385d3