Merge "Keystore 2.0: Fix wrong exception returned on not authenticated."