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

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

Change-Id: Ie577f0736765ef1c79630c116351a669f972c778