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

Change-Id: I020e1a408c126c81e0084c932da100d7aa421c5c