Merge "Allow system apps to define ephemeral permissions" into oc-dev