Merge "Moving tests to CTS." into stage-aosp-sc-ts-dev