Merge "LinkProperties: use ordered comparison for P-CSCFs - only on U+" am: 78e158f2bb am: 9135b92758

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

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