[automerger skipped] Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" am: 0104ce52 am: f5a037d6 am: e576ba8f -s ours
am skip reason: Change-Id I7ef41e8961e48d40e5685c4a521e83cb20953e48 with SHA-1 33692f73 is in history

Change-Id: I00a2bb2c2ee8f371e177c1a704a6d754d3ed8570