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

Change-Id: I22e8214021e8eb663272b6f9cdb124a46de4c077