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

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

Change-Id: I10095f7ebe1af557ae1fc89bfbfcca7b954844bd