Merge changes I49e5a99f,Ia3e4b336 into sc-dev

* changes:
  Updating timeout for Per-App CTS
  CTS tests for setOemNetworkPreference