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

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

Change-Id: Ic7cf0caeaa39dc6a4427c26f28c3735d5175ddb2