Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: ba3cedd7f1 am: 4d22d8279f

Change-Id: Iebeb70078906b5eb12b17ee14c8ac7ea749917b2
tree: 675e055ae505cfe0697b1ce7abb4966d56e2265b
  1. core/
  2. services/
  3. tests/