Merge "TelephonyRegistry: Avoid adding duplicate listener" into r-keystone-qcom-dev