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

Change-Id: Ia2de79d1e28f5141a67498ee8e6828f6f3ef892e