This reverts commit 468f2d3e. Breaking emergency dialer Bug: 112339366 Change-Id: Id1dc7b3b1e0c3628097926c47babfb52d0fdb99c