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