[automerger skipped] Convert WifiInfo to TransportInfo am: 6c5626edfc am: 78111d5950 am: ad29f8165c -s ours

am skip reason: Change-Id I12c473185dc5518f5684e83c2f49e07271738cb5 with SHA-1 36f802a060 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81556bd7875c0b03398a8c65601d8c12829c280e