am 82a36c3b: am b4805a18: am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.

Merge commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32'

* commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32':
  Change name of CTS DeviceInfoCollector package to TestDeviceSetup.