[automerger skipped] Merge "Detect upstream hotspot device type by checking...

[automerger skipped] Merge "Detect upstream hotspot device type by checking the vendor specific IE." into rvc-dev am: 21b9e608 -s ours am: 82799382 -s ours am: d2a3032f -s ours am: 390f0441 -s ours

am skip reason: Change-Id I8a3212fa066bdc8bf889768f92569891a3cb2408 with SHA-1 91f300fd is in history

Change-Id: Ide41e1b14427bc799de0afd75763488cd6914203