Merge "Bluetooth in band ring" am: c9082cecb3 am: cb87262975
am: d0e8859123

Change-Id: Icc37bbcf039497b9fa14406038764240ec6dcd4d