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