Merge "Clean up wifi metrics" into sc-dev am: 84764cf2a8

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

Change-Id: I2595cc582ce715a6474abe58af2d08b9d9102433