Merge changes I706ce9bb,I3fcc4e7a into udc-mainline-prod

* changes:
  Adding user property for CrossProfileContentSharingStrategy.
  Expose Userproperties builder methods for tests