Merge changes from topic "CRs_2401929_2401921" into q-keystone-qcom-dev

* changes:
  Contacts:  Contacts selection enhancements
  Contacts: Enable SIM contacts new solution
  Contacts: Drop SIM contacts features added by old solution