[automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438
am: e8b8d9917a
-s ours am: 37448ae2ae
am: 9928eff933
am: c6d3501a70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396 Change-Id: Ic7cf0caeaa39dc6a4427c26f28c3735d5175ddb2
This commit is contained in: