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

Change-Id: I7c483985257ee647c7d741e3e0c17efe390bd267