am 1d19dc58: am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev

* commit '1d19dc588f2e34bcbee39acc4f9636bec4ab3b17':
  Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."