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