Merge "Remove SIP service." into sc-v2-dev-plus-aosp