Merge "telephony annotations part 2"

core/java/android/telephony/PhoneStateListener.java

core/java/android/telephony/TelephonyRegistryManager.java

telecomm/java/android/telecom/Conference.java

telecomm/java/android/telecom/Connection.java

telephony/java/android/telephony/Annotation.java

telephony/java/android/telephony/PreciseCallState.java

telephony/java/android/telephony/ServiceState.java