Merge "Check correct err variable on wifi keystore HAL" am: 81f35573c7 am: 523a912137
am: 7b54866cf2

Change-Id: I8a9651bd4d0a64703f0b7707d4b2f5e06e0737f0