Merge "audiopolicy: align input and output devices for engine" into qt-dev am: 24ba1c4082
am: 665f3f2872

Change-Id: I590a0f9ad0941e8ff3379d76a923ce7ad1dece50