Merge "Remove privapp grants for CaptivePortalLogin" am: 64737571 am: 4d59ddaf am: 7b7eeccc am: 99607256 Change-Id: I65d45a366cd2b65ce22609c335640d6467634111