Merge "Check correct err variable on wifi keystore HAL"
am: 81f35573c7

Change-Id: I9e2644beb1f421e04c59f123636943dded81ae1b