Merge "Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis" into rvc-dev