Merge changes from topic "libnetworkstats" am: e1f8ad4d59

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

Change-Id: Ieaa47c2db815177eca095fcd424ece3926ddf460