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

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