Merge "Revert "Keystore 2.0 km_compat: Cuttlefish does not return a vendor patch level.""