Merge "Keystore 2.0: Don't use DB for keys with Domain::BLOB"