Merge changes from topic 'turn_on_supplicant_hidl' am: 91de517046 am: ec4c129044
am: 1d75f9c7a3

Change-Id: Idb5fcc9038d76fb8f302f07f69c31ff941c9567a