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

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

Change-Id: I5839fef7ac2e7d9a27e029af3133ddec3c081660