Merge "Fix for Telephony Manager API javadoc inconsistencies"