Merge "Correctly report phone state when call waiting is rejected" into lmp-dev