[automerger skipped] Merge "(Backport) Pipe though componentId from caller to permission checks" am: 574d0b7bd3 am: 10e78ef453 am: 5584abf731 -s ours
am skip reason: Change-Id I3e6a3b0bd1c443660d0dcd27b6c8af0388330dec with SHA-1 700a959aeb is in history

Change-Id: I3dbb4930732ad9ee00327f8b32b595e21300f040