am 74731fdb: Merge "CTS is always separately released for a single API level, hence no need to specify API level" into klp-dev

* commit '74731fdbc7d6130358d443a9d9b5fb1b73dc5399':
  CTS is always separately released for a single API level, hence no need to specify API level