Merge "Support reevaluation request from captive portal app"
am: 2d9623d86f

Change-Id: I5f376b4a342557b91b70d892308469b1fdda2363
tree: 5582bcfaa12a858727469337c8ed94b4344dfda2
  1. core/
  2. services/
  3. tests/