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

Change-Id: I50cb67de2bb448f7e85953c4f7504779dd4e7b80