Merge "Remove phone number from the "new" CallStateListener." into sc-dev