Merge "Bump Wifi to SDK 31" into sc-dev am: 3d18236a02

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

Change-Id: I657af46ff2a30d8cdc62c98df2cdd70541db1627