[automerger skipped] Merge "WifiInfo: Embed location sensitive TransportInfo" am: 08aafe3e7b am: e851146ed9 am: 8cb5daea60 -s ours

am skip reason: Change-Id Ibcf0c67114f09cbc25bf56b8ea5b63113defecc4 with SHA-1 5c20334edb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied2cd98fdbbf0ee9cd105737047c1c657d46e634