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

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

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