Merge "Update TestNetworkTracker tearDown()" am: cb9d36876e

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

Change-Id: I2b1b98ef5b06498fd953a4b28e14fdfb6dc4b07b