Merge "Merge "Adding additional docs for OemNetworkPreferences" am: 1258b5fec3 am: a9daf47946" 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