[automerger skipped] Merge "Add TestableNetworkOfferCallback" into sc-dev am: 994231a768 -s ours

am skip reason: Merged-In Iac7ec1bb4c34b4354f7b43fec86ded68c1a1d0de with SHA-1 1a37835fb1 is already in history

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

Change-Id: I5cb297ac556c49e2b43ebd36ef0c2df33b7528e8
tree: 8115d4f20f9f726fea1b7551646190141c4629fb
  1. staticlibs/