am 82fa124c: am 4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev

* commit '82fa124c3a2753ce70c04973d8004b2b1950993d':
  Adding more DeviceDefault for CTS tests