Merge "wpa_supplicant(hidl): Fix pin string generation" am: 73771e38ec
am: 970a68d018

Change-Id: I33d58cdeba934ff88f28c41ed10fab522d0a591a