Merge "LinkProperties: use ordered comparison for P-CSCFs." am: 7428de995b am: 9a53283d62 am: 1216106e15

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2580731

Change-Id: I20056e70c719ffb8533b750237a32a93b348e3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>