Merge "Car mode InCallService changes."
am: 1d4fcf1703

Change-Id: If7f239e57df1e6131b36548d0ebb06375fcffeaf