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

Change-Id: I5f376b4a342557b91b70d892308469b1fdda2363