Merge "Rename Connection time APIs for Conference.java" into mnc-dev