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

Change-Id: I7f0be9c02dfcfb866c2363f7eb5bf5768557be0b