[automerger skipped] (Backport) Pipe through featureId from caller to permission checks. am: 6c32b3e699 am: 61f51b103c am: 8e7ad14e76 -s ours
am skip reason: Change-Id I89e7c742d0cc79669cd4ff2c44eb3db25f8fa149 with SHA-1 3397ad8c17 is in history

Change-Id: If75dda8cdd2241570410ebe44a41cd305abf0e76