[automerger skipped] Merge "Remove usage of NetworkStatsService from...
[automerger skipped] Merge "Remove usage of NetworkStatsService from telephony-common." am: 26fbbbc4 am: 250ee6fc -s ours
am skip reason: Change-Id I69b3ad97d79d6f120e464746fb99d22bae3598eb with SHA-1 ff9fa74b is in history
Change-Id: If21aee0d308d4a679f40a2f9c6983a7f2abfe93e