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

Change-Id: Ic35dbcffa11973164e237462196fca50bfa5b6d2