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

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

Change-Id: I8696414ed05edcf453985f4d2639d29634374e70