Merge "TelephonyManager API review changes" into main