tree f1ba520f14073174f02a0ad71912b7691c7afb09
parent 333bb77a5f7dda9c4afd5500b38215bba9ecae54
parent 3ce5c55680bbf5bb1d3fcb90245fde9dcf9920e9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614802891 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614802891 +0000

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