Merge "Make headset icons consistent before / after pairing"
am: 690bdb22c9

Change-Id: I64a9a3a7d8a2f110ee1809af33583f82fc4b4f57