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

Change-Id: I6919c2cc3083950c23c361c16dd667d8109f2139