Merge "Remove stopship for idmap2 vendor sdk checking" into qt-dev

};

bool VendorIsQOrLater() {

  // STOPSHIP(b/119390857): Check api version once Q sdk version is finalized

  std::string version = android::base::GetProperty("ro.vndk.version", "Q");

  return version == "Q" || version == "q";

  constexpr int kQSdkVersion = 29;

  int version = std::atoi(android::base::GetProperty("ro.vndk.version", "29").data());

  // If the string cannot be parsed, it is a development sdk codename.

  return version >= kQSdkVersion || version == 0;

}

Result<std::unique_ptr<std::vector<std::string>>> FindApkFiles(const std::vector<std::string>& dirs,