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

Change-Id: Iadd9dd5e3fbf3c4a22af173a5c869221c6b60ea5