tree 3feec6a1cc7b2e876ace934f10deebc25385303c
parent c99db5dfd6cbb5a4ea8858084aaf0d6e7fe55c7f
parent 68fad37f38f14631d5ed38d789ebc1b92a95ff27
author James Mattis <jmattis@google.com> 1614983865 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614983865 +0000

Merge "Applying OEM network pref to all users" am: 3f0925ee2e am: 00f75b0b32 am: 68fad37f38

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9988f9ecac19976dd78dbcf9a749adba5daa578c