[automerger skipped] Merge "Added duplicate interface detection" am:...

[automerger skipped] Merge "Added duplicate interface detection" am: 6b028cf7 am: 4dd52a3d -s ours am: cf92ad53 -s ours am: b24abb0b -s ours

am skip reason: Change-Id I35de7b9db511576cb3fbdfcded1a2db15f35c322 with SHA-1 be72821c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1369563

Change-Id: I9f1e864ad00a3871bb6fdac858670ae76318c928