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

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

Change-Id: I840f82ec83d2d97598b6a41ddf5fd8807ee605d1