Merge "Add FEATURE_TELEPHONY_SATELLITE to PackageManager"