[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
am: 4fc5e348bf
-s ours am: 8eb932b5b1
-s ours
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: I9aa4c9e5995037bfa5ad5ace90889d430993dd27
This commit is contained in: