Merge "Expose adhoc conference calling API as public."

api/current.txt

non-updatable-api/current.txt

telecomm/java/android/telecom/Call.java

telecomm/java/android/telecom/Conference.java

telecomm/java/android/telecom/Connection.java

telecomm/java/android/telecom/ConnectionService.java

telecomm/java/android/telecom/TelecomManager.java

telephony/java/android/telephony/CarrierConfigManager.java