Merge "Clean up lint errors" into sc-dev am: 2847ca7378

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

Change-Id: Ia908a65bc9751a4f6c3089c546b3d979ce3e68bf