Merge "Revert "[Settings] Refactor PhoneStateListener""