Merge changes from topic "libnetworkstats" am: e1f8ad4d59 am: f1d14732f9

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

Change-Id: I706e7befef3943936a33c06637194d7dc27a3037