Merge "Applying OEM network pref to all users" am: c1a548b132 am: b6625e5976 am: a5e243419a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9988f9ecac19976dd78dbcf9a749adba5daa578c