[automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b54 am: e8b8d991 -s ours

am skip reason: skipped by user jackalguo

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: Ia3b8566a3fa72c7cf45501d1610c183bcc6ee7be