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

Change-Id: Ie4ab6f06f491fee57c0b0fea7df0e092b43909a4