Merge "wifi: fix FILS network detection" into sc-dev am: 2f6a113f17

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

Change-Id: Ia435c7cf7ee3c473d4eae60f80e73a72288bcf3c