Merge "Select correct devices when ENFORCED_AUDIBLE is set" am: 982ecd07f4 am: 0629cc56d0 am: d46124d0a1

Change-Id: Ieb08a772528f1a07dbcfe7b4274dce4f8f4e7909