Merge "[automerger skipped] Merge "Enable helper apps built into mts-permission." into mainline-prod am: da3f46d0dd -s ours" into sc-dev