[automerger skipped] Merge "DcController: Compare LinkAddress Subset" into...

[automerger skipped] Merge "DcController: Compare LinkAddress Subset" into sc-dev am: eee80355 -s ours am: 378efaf1 -s ours am: 2b94a541 -s ours

am skip reason: Merged-In Ide7bf63279b0db6a261735d82b39ae7a263ccdb4 with SHA-1 bb7166e9 is already in history

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

Change-Id: I66205429dfeaa070553e963c4647699c75d4afd6