Merge "Instrument wifi-service when EMMA_INSTRUMENT_FRAMEWORK is true." into nyc-mr1-dev
am: e4156458e6

Change-Id: Idd8ac156d67b998ccdc6413c0f4504d9316006fa
tree: 4d2a68fa47481714a500e5a738dbfa1edbcb43c6
  1. service/