Merge "[Settings] Revert the test for using mPhoneStateListener since the Robolectric test is broken" into sc-dev