Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev