Merge "DO NOT MERGE Revert "Add FEATURE_TELEPHONY_SATELLITE feature definition"" into udc-dev