Merge "TelephonyDisplayInfo support changes for Satellite" into main