tree a9947f966b44186a72ec314b45f65e2e956b963e
parent 7526d5687c44e3010433ea4c21c09e79ae3efe96
parent c1a548b13250b1faaf5786d3d8cfa0f5a0ab30dd
author James Mattis <jmattis@google.com> 1614980363 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614980363 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id805612e7b807dd789c4ff88a933660fb11b12cf