Merge "Fix errorprone warnings that should be errors" am: 206c2e3839

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

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