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

Change-Id: I2b2f9b157eb9abeefa781f0d7d49b83f93c06d12