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

Change-Id: I3e5645099ab4449514cbf385beb099b411893bbd