Merge changes from topic "testStatsProvider-cp" am: 8dc319b30f am: 1970a47c61

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1843374

Change-Id: Ic901bf8cd0a63021fc06688d20e355fb4e69d4e3
tree: 4c11d797c73e9cfb13f8fa559b3e5c43fde2d458
  1. staticlibs/