Merge "(Backport) Pipe though componentId from caller to permission checks"
am: 574d0b7bd3

Change-Id: I98b9e71ff75f45fba0f80d903b16aca6d7bfc2e8