Merge "Remove privapp grants for CaptivePortalLogin"