Merge changes If2744766,Ib383241b

* changes:
  FrameworksWifiApiTests runtest.sh: do not run with root
  Add FrameworksWifiTests to MTS
tree: 4a9f12d2a4c4556ccf7620da704c879f58ec7c21
  1. apex/
  2. service/
  3. PREUPLOAD.cfg