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

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