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

Change-Id: Ia110a4d03e65d81b71c05f4b27a2c4fa39e80048