Merge "Follow-up 2076940: Allow device owner to configure profile network preference "