Merge changes from topic "per-app-cts"

* changes:
  CTS tests for setOemNetworkPreference
  Update CS so that per-app OEM APIs can be tested