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

Change-Id: I68c2a07a4b6358ff69470393fcaa6e4e873fcdd1