[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am:...

[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf87 am: 4fc5e348 -s ours am: 8eb932b5 -s ours am: 00e8b63d -s ours am: 5d9d1996 -s ours

am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f is in history

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

Change-Id: I5578b499fb7c5b81bf6830174914b5afcf998992