[automerger skipped] Merge "Mark networks with OEM_PAID always restricted" into pi-dev am: c4020ffcab
am: 0580e6b7fb  -s ours

Change-Id: Iac1cc6188fcb0938a0ddf2a2da45b92e5177b1f0