Merge "audiopolicy : Fix for incorrect input device selection" into lmp-mr1-dev