Merge changes from topic "libnetworkstats" am: e1f8ad4d59

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958140

Change-Id: I9efbd8c0bfffc1b7ca779de2978dec3e01da48cb