Merge "Fix errorprone warnings that should be errors" am: fdd9d9cbb0

Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2256761

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