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