[automerger skipped] Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: 4940da0b98 am: 8c5e78eae6 am: b41fe0a9a3 -s ours
am skip reason: Change-Id I559d42089aeb09801d14c251c5165fca793c3cb3 with SHA-1 a1b805852e is in history

Change-Id: I312db6a0bd341833c53f83be3d72da5b1bf9d7cf