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

Change-Id: I09813d60dacabbd98e395816f9d7cb6d965a4f19