Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: 4940da0b98 am: 8c5e78eae6

Change-Id: Iebeb70078906b5eb12b17ee14c8ac7ea749917b2