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

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

Change-Id: Ie9623612b39d62d4b114100fdbbd6c5333877bd8