Merge "Add permission check for CaptivePortal#reevaluateNetwork"