Merge "Update ringer to take BT device into account" am: 9533e0a4de am: fb7b5bf5e3 am: 2900263b1f
am: 4bd0e0e8de

Change-Id: I55816a71aa1b505ac489c43e9d3110c091c830e2