[automerger skipped] Merge "LinkProperties: use ordered comparison for P-CSCFs." into tm-mainline-prod am: 11817f2b62 -s ours am: fc38c393cf -s ours am: 922108abe4 -s ours am: 0c858b4176 -s ours

am skip reason: Merged-In Ia1884f37739a20d871dd0024cc72cb18c083dc8e with SHA-1 78b8ff8493 is already in history

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

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