Merge "Enforce map the telephony features with APIs in PhoneInterfaceManager." into main