Merge "Use builder to pass profile network preference" am: e4c549ab09

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904411

Change-Id: If88433db8dd8e8d7fe39903d06811d7015e85988