Merge "audio policy: make input device selection more consistent" into pi-dev
am: 258fb48d14

Change-Id: I0a66540bd05d6e376fde5e24c5a2bdf0f1776a95