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

Change-Id: I2f9de2582025c8fc3782870b8c561ce2002abaf8