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

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

Change-Id: I8dc0a34f264b92bdcdf702644bf3f0b6884f9468