Merge "Make headset buttons work with simulated ringing" am: 091fcc1b1a am: 2fd2d72707
am: 63770be1e7

Change-Id: I9e97f4be007c489b17502821ce1c8adfb4b82b67