Merge "Remove dup code" am: cfee0efc86

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

Change-Id: I794b7fbd4cba5cf47d7a33edda72f32c7988262b