Merge "[Settings] Refactor PhoneStateListener"