Merge "Remove CDMA doc in setPreferredNetworkType()" am: 8aeeea135a
am: 89470414f2

Change-Id: I085a2a02eecf2b28ccb63d393f9e909713bd4e65