Merge changes from topics 'id_str_supplicant_hidl', 'p2p_wps_supplicant_hidl'
am: 6f7de57928

Change-Id: I3939792c989e172553482003267fc9f532b1f547