Merge "Bluetooth in band ring"
am: 6bbe521c55

Change-Id: Ieebd3d997787821d723cb532856691781b774bfa