Merge "CTS test for new PackageManager strings for StepCounter and StepDetector." into klp-dev