Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e

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

Change-Id: Icf8d0db6ffb41041652ae27f0573da2f118465c3