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

Change-Id: I7d2b7843fd74e4505085ef693e4dc47d791b115a