Merge "Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis" into rvc-dev am: 50b916bd am: f0ef506f Change-Id: I5b8fd9c19f43d5a37ee6681d5f04369222b8ea90