[automerger skipped] Merge "Merge NetworkStatsService handler changes." into rvc-dev am: fa2f88e2 -s ours
am skip reason: Change-Id If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7 with SHA-1 2a6439d7 is in history
Change-Id: Ie58da93cd3a7876d8dc56bbcff90bcfd0a38c9d3