[automerger skipped] Merge "WifiInfo: API changes to conform with connectivity API changes" am: 20ad12beb9 am: 3ce44e2410 am: e5dcd08f09 -s ours

am skip reason: skip tag Change-Id I89d1685c5159f38fa4245b7291456e9d594cb808 with SHA-1 e16f0d4758 is already in history

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

Change-Id: Ica35119602608f121794fb1e8436213e4599fd50