Merge "Applying OEM network pref to all users" am: c1a548b1 am: b6625e59

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ec8289855a810504e82b8828a4160929f13d19b