Merge "[Settings] Remove PhoneStateIntentReceiver" am: 1a3ed7a560 am: dbc6a6395e

Change-Id: Iece6ca294d5c52595b3ad249a2ea1a09ae0a6e8d