Merge "Remove dup code" am: cfee0efc86 am: 4baf8e93d4 am: 674abd1649

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1458159

Change-Id: I97f8a8091927c0817d69e29b096cecbfc24187b1