Merge "Update ringer to take BT device into account" into oc-dev am: 3048c360f7
am: c061775bbf

Change-Id: I9b525749e4843197a5403253253da7f055fdf012