Merge "Remove @SystemApi from public permissions"