Merge changes from topic "cherrypicker-L86300000960661534:N86700001369044773" into udc-dev

* changes:
  [automerge] LinkProperties: use ordered comparison for P-CSCFs. 2p: 78b8ff8493
  LinkProperties: use ordered comparison for P-CSCFs.