Merge "Remove the OEM hook implementation and usage"

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

telephony/java/android/telephony/PhoneStateListener.java

telephony/java/android/telephony/TelephonyManager.java

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

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

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