Merge "Clearify javadoc on Phone.NORMALIZED_NUMBER." into jb-dev