Merge "Added an intent action key for carrier satellite service" into main