[automerger skipped] Merge "[Settings] Remove PhoneStateIntentReceiver" am: 1a3ed7a560 am: dbc6a6395e am: 30fa13d592 -s ours
am skip reason: Change-Id Ib39ab1881484f65bc5a3834b2828c6ba98198cca with SHA-1 717e0765a5 is in history

Change-Id: Ie91fb45a508a24d6ceb7c9d31114cc848af9d6a7