Merge "Add TestableNetworkOfferCallback" am: 9797bd3933 am: 49b4f64e10

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

Change-Id: I99964f59b99dec4ad3aeeaf460efac1e219d10e9
tree: d8f0c3faf0b0ba24e6165aec7f1cc3d656085aa1
  1. staticlibs/