am 4cba4a05: am 80063e1e: am 853cb290: Merge "CTS test for new PackageManager strings for StepCounter and StepDetector." into klp-dev

* commit '4cba4a054bbf530d30fa6e671f347dd356b5ac1c':
  CTS test for new PackageManager strings for StepCounter and StepDetector.