Merge "Remove privapp grants for CaptivePortalLogin" am: 64737571b8 am: 4d59ddaf6b am: 7b7eeccc64 am: 9960725682

Change-Id: I65d45a366cd2b65ce22609c335640d6467634111