Merge "Keystore 2.0: Don't use DB unconditionally in generate_key()"