Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 1ad27ef2a1 am: 8e8f318c1f am: 8396dbf036

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2207873ffb549f26026e33f14440be494e4b4175
tree: ad7612d1abe3239d47bb26de8b31ce41b362857f
  1. core/
  2. services/