Merge "WifiInfo: Embed location sensitive TransportInfo" am: 08aafe3e7b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5671971169e78fb44fca87f2c860493cee71fac5