am c428e10e: Merge "lock TestDeviceSetup to one SDK to allow running PTS for older systems" into jb-mr2-dev

* commit 'c428e10ec137da41cb66008ad76db2b12407b193':
  lock TestDeviceSetup to one SDK to allow running PTS for older systems