Merge changes from topic "libnetworkstats" am: e1f8ad4d59 am: 3495b52981

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

Change-Id: I0cef427117653d3666d1df4a94a33d4accac9285