Merge "Keystore 2.0: Skip compat test if no legacy keymaster is available."