Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438

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

Change-Id: I7fc418fd2abb11be330b2b7f2139d5d44307b3d1