Merge "Bluetooth in band ring" am: 6bbe521c55 am: 35cc19c2a8
am: 2cc259c3ea

Change-Id: Ifaccf2157515d3a87636becd45f484defbaa15a6