Merge "Address linter error in TestableNetworkCallbackTest" am: 25b0aeb2a2 am: 3fd3a926dc am: a1ee36d5be

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1759009

Change-Id: I21118ff403380ba9ae5f1a4377b32742e61763e0