Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code"
am: 0104ce5293

Change-Id: I8eee2a26fd6f397098edd4a673752d087c70edb6