Merge "Add documentation for CaptivePortal APP_RETURN_*"
am: 3886def4fa

Change-Id: Idc55c5c729e2a66ad845dbc8ddaf97580c7ae8cc