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

Change-Id: Icde2255db370840753cf8a69199458d7aed07dfc