Merge "Revert "audiopolicy: align input and output devices for engine"" into qt-qpr1-dev am: 6302adca26 am: d0a8ff659d

Change-Id: Ibe604a19c059b0b911730e66ef867099e5328f3f