Merge "Update TestNetworkTracker tearDown()" am: cb9d36876e am: 771421d00e

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

Change-Id: I5693d4b25c07dc531353b42c328307528b2d6aac
tree: eb71832f7873e7ab6833abad6b4e528dceb99d71
  1. staticlibs/