Merge "Changes to support emergency registration APIs and callbacks." into main

core/api/current.txt

core/api/system-current.txt

telephony/java/android/telephony/ims/ImsMmTelManager.java

...java/android/telephony/ims/ImsRegistrationAttributes.java

...ony/java/android/telephony/ims/aidl/IImsRegistration.aidl

...a/android/telephony/ims/stub/ImsRegistrationImplBase.java

...phony/java/com/android/internal/telephony/ITelephony.aidl