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

Change-Id: I036781f8908da81ea294abafaf6c72e9d03699c8