Merge "Merge "Adding additional docs for OemNetworkPreferences" am: f13bcb0899 am: f2c389c4c5" into rvc-qpr-dev-plus-aosp am: 29ad2f4b42

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba0f7e0c3a883d23901283b7fbfe822cdbae4ca6
tree: f1ba520f14073174f02a0ad71912b7691c7afb09
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS