Merge "Bluetooth in band ring" am: dbfaf31357
am: 8c73ee91f5

Change-Id: I1972da1da7bc0c001dc4525858bdb0e8bd5dd530