tree 1b5fe2b0a812b51ec7c5e31acf49daa1ec963c58
parent 9b87bcb32deb66524dcb33f62ab249907d6ca00a
parent 9e1bc22ce51f1f8e55be5bacbbb5fe990c866f5c
author James Mattis <jmattis@google.com> 1617917376 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617917376 +0000

Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5

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

Change-Id: I14a27b3b9e7dad67fe9ca275527926e63d465b9a