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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa08c46d9373ae4804228894a582b6c6d76e6284