[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 skip reason: Change-Id I57c709c5da984accbbb389ab8d1295eae01328c6 with SHA-1 0c9f1c46 is in history

Change-Id: I39b42c0f6c321d50787a640ca46e91957fcc1863