Merge "Avoid trying to grant non-ephemeral permissions to instant apps"