[automerger skipped] Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: ba3cedd7f1 am: 4d22d8279f am: 994e4c7f01 -s ours
am skip reason: Change-Id I559d42089aeb09801d14c251c5165fca793c3cb3 with SHA-1 845c63755c is in history

Change-Id: I312db6a0bd341833c53f83be3d72da5b1bf9d7cf
tree: fe796b14579a8eff6d5129b5089797fcfc91ff04
  1. core/
  2. services/
  3. tests/