[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 -s ours am: 66aaff72 -s ours am: 5ef1a5f1 -s ours

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

Change-Id: I2cca35fab863c4c370c22ca958110be0b6b40422