Merge "Fix lint and errorprone warnings in FakeDns." into main am: c29fbe7777 am: f8392ce5ad

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

Change-Id: I8ace21ca12cdb60e2914079879dc27d184ad483c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>