Merge "Bluetooth in band ring"
am: c9082cecb3

Change-Id: I819b5510c45612b25d4fc1101d358f6d77691f12