[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 am: f592f933 am: 2809d38c am: 547efeab -s ours am: 135d39f5 -s ours

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

Change-Id: I6b9d3c9b7c8896f41dd60757190fb0eb4fea1ad2