Merge "TelephonyRegistry: Avoid adding duplicate listener"