Merge "wpa_supplicant(hidl): Use macros for WPS param sizes" am: a16284d559
am: 48e3858d57

Change-Id: I15cbd27c2f5ea46bb28ee227f473c7869903ff88