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

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

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