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

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

Change-Id: Ifeb515f93c04aaa34298ddd3603fc832fde3bdbe