Merge commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f' * commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f': Update javadoc for TelephonyManager.getNetwork* for CDMA.
Merge commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f' * commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f': Update javadoc for TelephonyManager.getNetwork* for CDMA.