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

Change-Id: Ibc518a29d8a31b3001aa6569ee370c45ce302f7c