am 0d82d138: am c6823f5a: am 46336e42: am 28d2127f: am 0009e20d: Merge "EDI: Add PackageDeviceInfo collector to cts/common" into mnc-dev

* commit '0d82d1385a0b4872f41b5ca81f26abc324d00a31':
  EDI: Add PackageDeviceInfo collector to cts/common