Merge "Bluetooth in band ring"
am: dbfaf31357

Change-Id: I24b9169afc67e376a22c99f8a1ae7117549401f8