Merge "TelephonyRegistry: Avoid adding duplicate listener" am: 6334152357

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

Change-Id: I5859f20686e50ae9c98f8acca54a375276944073