Merge "Formalize Fi specific TelephonyManager APIs" into main