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

Change-Id: I7b2199959c63fe9501350a3e7b022c75c6176236