Merge "Phone service state change atom." am: 419fc89b52
am: 16e3399902

Change-Id: Ifbff53d3b113c527975b5509289600f734dcca7b