Merge changes Id26a24c8,I3b6ac97e into main

* changes:
  Make getProviderIfaceStats return Entry
  Return Entry from TrafficStats JNI