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

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

Change-Id: I0d61424323e289125260fd6e51adc270d209d6c2