Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 am: a2e068a2b4 am: 60eb5503e8
am: a78e718b26

Change-Id: I20b0fe30ab6b882e4f517147e9ffabe786d73988