HLTE: Fix mappings for voice reg in headset case.

  Credit to Christopher R. Palmer for the fix.

Change-Id: I48ee85095e07318464f654708d93c39a17831d36
Merge branch 'cm' into HEAD