Merge "Keystore 2.0: isKeystore2Enabled returned wrong value."