Merge "Revert "Notify IMS Call info via CallAttributesListener""

core/api/system-current.txt

core/java/android/telephony/PhoneStateListener.java

core/java/android/telephony/TelephonyCallback.java

core/java/android/telephony/TelephonyRegistryManager.java

...a/com/android/internal/telephony/IPhoneStateListener.aidl

...va/com/android/internal/telephony/ITelephonyRegistry.aidl

services/core/java/com/android/server/TelephonyRegistry.java

telephony/java/android/telephony/Annotation.java

telephony/java/android/telephony/CallAttributes.java

telephony/java/android/telephony/CallState.aidl

telephony/java/android/telephony/CallState.java

telephony/java/android/telephony/ims/ImsCallProfile.java