Merge changes from topics 'id_str_supplicant_hidl', 'p2p_wps_supplicant_hidl'
am: 639bb13553

Change-Id: I7748acb54fc999001d816a39519ff15ced186682