Merge "Pipe through featureId from caller to permission checks in telephony code"