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

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

Change-Id: I7f420c6ae54685d42039a19223ce1c27060a16be