Fix errorprone warnings that should be errors am: 0390f75869 am: 78184bece7

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

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