Merge "Mark networks with OEM_PAID always restricted" into pi-dev
am: c4020ffcab

Change-Id: I3fe4d11eec36eb20b44a8fdd2489b5fcdd144dff