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

* commit '4f65a5456159b64185bb99c193bcff93b07770f8':
  Adding more DeviceDefault for CTS tests