Merge "TelephonyRegistry: Avoid adding duplicate listener" am: 6334152357 am: 3ba0f5da1d am: 4aeb2ecda5 am: 276ee5c666

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433021

Change-Id: I6523fadaae6ddb2794e95a8fc0ed340a8468eedf