Merge changes from topic "cherrypicker-L71000000954340623:N48000001260389895" into tm-dev

* changes:
  Follow-up 2076940: Allow device owner to configure profile network preference
  Allow device owner to configure profile network preference