Merge "Add documentation for CaptivePortal APP_RETURN_*" am: 31e3f2e734 am: 72841b4287
am: 73a4b8e463

Change-Id: I2fce43bf23ac9689f69bc2c432b3032cc9abb7d9