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

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

Change-Id: Ied7a59bf5121ff922bd3f14cdf3c93dadc50b014